screenShield: Don't lock after crash if locking is disabled

When the user has disabled locking we shouldn't lock the screen.

https://bugzilla.gnome.org/show_bug.cgi?id=704884

diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 03e457c9069df1966d4c7ae8f3e47ad93d5653e8..6aef53b1a913e4ba59f9b73024fd5d788e785e0b 100644 (file)
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -1335,6 +1335,8 @@ const ScreenShield = new Lang.Class({
 
     // If the previous shell crashed, and gnome-session restarted us, then re-lock
     lockIfWasLocked: function() {
+        if (!this._settings.get_boolean(LOCK_ENABLED_KEY))
+            return;
         let wasLocked = global.get_runtime_state('b', LOCKED_STATE_STR);
         if (wasLocked === null)
             return;